From d1aae4bffafac19eb2effcf162b2a61d8f4f1bb0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Jun 2023 23:14:39 -0400 Subject: [PATCH] print: Move all the remaining sources Move the unix- and Windows-specific print sources to the gtk/print subdirectory. --- gtk/gtkmain.c | 2 +- gtk/meson.build | 38 ++--------------- gtk/{ => print}/gtkcustompaperunixdialog.c | 0 gtk/{ => print}/gtkcustompaperunixdialog.h | 0 gtk/{ => print}/gtkpagesetupunixdialog.c | 2 +- gtk/{ => print}/gtkpagesetupunixdialog.h | 0 gtk/{ => print}/gtkprint-win32.c | 0 gtk/{ => print}/gtkprint-win32.h | 0 gtk/{ => print}/gtkprintbackend.c | 0 gtk/{ => print}/gtkprintbackendprivate.h | 4 +- gtk/{ => print}/gtkprinter.c | 0 gtk/{ => print}/gtkprinter.h | 0 gtk/{ => print}/gtkprinteroption.c | 0 gtk/{ => print}/gtkprinteroptionprivate.h | 0 gtk/{ => print}/gtkprinteroptionset.c | 0 gtk/{ => print}/gtkprinteroptionsetprivate.h | 0 gtk/{ => print}/gtkprinteroptionwidget.c | 0 .../gtkprinteroptionwidgetprivate.h | 2 +- gtk/{ => print}/gtkprinterprivate.h | 2 +- gtk/{ => print}/gtkprintjob.c | 0 gtk/{ => print}/gtkprintjob.h | 2 +- gtk/{ => print}/gtkprintoperation-portal.c | 4 +- gtk/{ => print}/gtkprintoperation-portal.h | 2 +- gtk/{ => print}/gtkprintoperation-private.h | 2 +- gtk/{ => print}/gtkprintoperation-unix.c | 0 gtk/{ => print}/gtkprintoperation-win32.c | 0 gtk/{ => print}/gtkprintunixdialog.c | 0 gtk/{ => print}/gtkprintunixdialog.h | 4 +- gtk/{ => print}/gtkprintutilsprivate.h | 0 gtk/{ => print}/gtkunixprint.h | 8 ++-- gtk/print/meson.build | 41 +++++++++++++++++++ gtk/{ => print}/paper_names.c | 0 gtk/{ => print}/paper_names_offsets.c | 0 modules/printbackends/gtkprintbackendcups.c | 8 ++-- modules/printbackends/gtkprintbackendcups.h | 2 +- modules/printbackends/gtkprintbackendfile.c | 2 +- modules/printbackends/gtkprintbackendfile.h | 2 +- modules/printbackends/gtkprintercups.h | 4 +- 38 files changed, 70 insertions(+), 61 deletions(-) rename gtk/{ => print}/gtkcustompaperunixdialog.c (100%) rename gtk/{ => print}/gtkcustompaperunixdialog.h (100%) rename gtk/{ => print}/gtkpagesetupunixdialog.c (99%) rename gtk/{ => print}/gtkpagesetupunixdialog.h (100%) rename gtk/{ => print}/gtkprint-win32.c (100%) rename gtk/{ => print}/gtkprint-win32.h (100%) rename gtk/{ => print}/gtkprintbackend.c (100%) rename gtk/{ => print}/gtkprintbackendprivate.h (99%) rename gtk/{ => print}/gtkprinter.c (100%) rename gtk/{ => print}/gtkprinter.h (100%) rename gtk/{ => print}/gtkprinteroption.c (100%) rename gtk/{ => print}/gtkprinteroptionprivate.h (100%) rename gtk/{ => print}/gtkprinteroptionset.c (100%) rename gtk/{ => print}/gtkprinteroptionsetprivate.h (100%) rename gtk/{ => print}/gtkprinteroptionwidget.c (100%) rename gtk/{ => print}/gtkprinteroptionwidgetprivate.h (99%) rename gtk/{ => print}/gtkprinterprivate.h (98%) rename gtk/{ => print}/gtkprintjob.c (100%) rename gtk/{ => print}/gtkprintjob.h (99%) rename gtk/{ => print}/gtkprintoperation-portal.c (99%) rename gtk/{ => print}/gtkprintoperation-portal.h (98%) rename gtk/{ => print}/gtkprintoperation-private.h (99%) rename gtk/{ => print}/gtkprintoperation-unix.c (100%) rename gtk/{ => print}/gtkprintoperation-win32.c (100%) rename gtk/{ => print}/gtkprintunixdialog.c (100%) rename gtk/{ => print}/gtkprintunixdialog.h (98%) rename gtk/{ => print}/gtkprintutilsprivate.h (100%) rename gtk/{ => print}/gtkunixprint.h (83%) rename gtk/{ => print}/paper_names.c (100%) rename gtk/{ => print}/paper_names_offsets.c (100%) diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 9c07e3d652..573f250d8b 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -63,7 +63,7 @@ #include "gtkwidgetprivate.h" #include "gtkwindowprivate.h" #include "gtkwindowgroup.h" -#include "gtkprintbackendprivate.h" +#include "print/gtkprintbackendprivate.h" #include "gtkimmoduleprivate.h" #include "gtkroot.h" #include "gtknative.h" diff --git a/gtk/meson.build b/gtk/meson.build index 479a7b6269..7b8926451b 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -676,50 +676,18 @@ if os_unix and tracker3_dep.found() endif if os_unix - gtk_unix_print_headers = [ - 'gtkpagesetupunixdialog.h', - 'gtkprintunixdialog.h', - 'gtkprinter.h', - 'gtkprintjob.h', - 'gtkunixprint.h', - ] install_headers(gtk_unix_print_headers, subdir: 'gtk-4.0/unix-print/gtk') - - gtk_unix_print_sources = files([ - 'gtkcustompaperunixdialog.c', - 'gtkpagesetupunixdialog.c', - 'gtkprintbackend.c', - 'gtkprinter.c', - 'gtkprinteroption.c', - 'gtkprinteroptionset.c', - 'gtkprinteroptionwidget.c', - 'gtkprintjob.c', - 'gtkprintoperation-unix.c', - 'gtkprintoperation-portal.c', - 'gtkprintunixdialog.c', - ]) - gtk_sources += gtk_unix_print_sources endif if os_win32 - gtk_win32_print_headers = [] - gtk_win32_print_sources = files([ - 'gtkprint-win32.c', - 'gtkprintoperation-win32.c', - 'gtkfilechoosernativewin32.c', - 'gtkwin32.c', - ]) - gtk_sources += gtk_win32_print_sources gtk_sources += [ 'gtkcolorpickerwin32.c', - 'gtkimcontextime.c' + 'gtkimcontextime.c', + 'gtkfilechoosernativewin32.c', + 'gtkwin32.c', ] - - if cc.has_header_symbol('windows.h', 'IPrintDialogCallback') - cdata.set('HAVE_IPRINTDIALOGCALLBACK', 1) - endif endif if x11_enabled diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/print/gtkcustompaperunixdialog.c similarity index 100% rename from gtk/gtkcustompaperunixdialog.c rename to gtk/print/gtkcustompaperunixdialog.c diff --git a/gtk/gtkcustompaperunixdialog.h b/gtk/print/gtkcustompaperunixdialog.h similarity index 100% rename from gtk/gtkcustompaperunixdialog.h rename to gtk/print/gtkcustompaperunixdialog.h diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/print/gtkpagesetupunixdialog.c similarity index 99% rename from gtk/gtkpagesetupunixdialog.c rename to gtk/print/gtkpagesetupunixdialog.c index c0de95de55..e9f5cfd6ab 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/print/gtkpagesetupunixdialog.c @@ -33,7 +33,7 @@ #include "gtkpagesetupunixdialog.h" #include "gtkcustompaperunixdialog.h" #include "gtkprintbackendprivate.h" -#include "print/gtkpapersize.h" +#include "gtkpapersize.h" #include "gtkprintutilsprivate.h" #include "deprecated/gtkdialogprivate.h" diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/print/gtkpagesetupunixdialog.h similarity index 100% rename from gtk/gtkpagesetupunixdialog.h rename to gtk/print/gtkpagesetupunixdialog.h diff --git a/gtk/gtkprint-win32.c b/gtk/print/gtkprint-win32.c similarity index 100% rename from gtk/gtkprint-win32.c rename to gtk/print/gtkprint-win32.c diff --git a/gtk/gtkprint-win32.h b/gtk/print/gtkprint-win32.h similarity index 100% rename from gtk/gtkprint-win32.h rename to gtk/print/gtkprint-win32.h diff --git a/gtk/gtkprintbackend.c b/gtk/print/gtkprintbackend.c similarity index 100% rename from gtk/gtkprintbackend.c rename to gtk/print/gtkprintbackend.c diff --git a/gtk/gtkprintbackendprivate.h b/gtk/print/gtkprintbackendprivate.h similarity index 99% rename from gtk/gtkprintbackendprivate.h rename to gtk/print/gtkprintbackendprivate.h index be14331673..0e72f47cff 100644 --- a/gtk/gtkprintbackendprivate.h +++ b/gtk/print/gtkprintbackendprivate.h @@ -27,8 +27,8 @@ #endif #include -#include -#include +#include "gtkunixprint.h" +#include "gtkprinteroptionsetprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkprinter.c b/gtk/print/gtkprinter.c similarity index 100% rename from gtk/gtkprinter.c rename to gtk/print/gtkprinter.c diff --git a/gtk/gtkprinter.h b/gtk/print/gtkprinter.h similarity index 100% rename from gtk/gtkprinter.h rename to gtk/print/gtkprinter.h diff --git a/gtk/gtkprinteroption.c b/gtk/print/gtkprinteroption.c similarity index 100% rename from gtk/gtkprinteroption.c rename to gtk/print/gtkprinteroption.c diff --git a/gtk/gtkprinteroptionprivate.h b/gtk/print/gtkprinteroptionprivate.h similarity index 100% rename from gtk/gtkprinteroptionprivate.h rename to gtk/print/gtkprinteroptionprivate.h diff --git a/gtk/gtkprinteroptionset.c b/gtk/print/gtkprinteroptionset.c similarity index 100% rename from gtk/gtkprinteroptionset.c rename to gtk/print/gtkprinteroptionset.c diff --git a/gtk/gtkprinteroptionsetprivate.h b/gtk/print/gtkprinteroptionsetprivate.h similarity index 100% rename from gtk/gtkprinteroptionsetprivate.h rename to gtk/print/gtkprinteroptionsetprivate.h diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/print/gtkprinteroptionwidget.c similarity index 100% rename from gtk/gtkprinteroptionwidget.c rename to gtk/print/gtkprinteroptionwidget.c diff --git a/gtk/gtkprinteroptionwidgetprivate.h b/gtk/print/gtkprinteroptionwidgetprivate.h similarity index 99% rename from gtk/gtkprinteroptionwidgetprivate.h rename to gtk/print/gtkprinteroptionwidgetprivate.h index b470cfd398..dac14bc7a7 100644 --- a/gtk/gtkprinteroptionwidgetprivate.h +++ b/gtk/print/gtkprinteroptionwidgetprivate.h @@ -16,8 +16,8 @@ */ #pragma once +#include #include "gtkprinteroptionprivate.h" -#include "gtkbox.h" G_BEGIN_DECLS diff --git a/gtk/gtkprinterprivate.h b/gtk/print/gtkprinterprivate.h similarity index 98% rename from gtk/gtkprinterprivate.h rename to gtk/print/gtkprinterprivate.h index 409e66ffb3..451588ed6f 100644 --- a/gtk/gtkprinterprivate.h +++ b/gtk/print/gtkprinterprivate.h @@ -19,7 +19,7 @@ #pragma once #include -#include +#include "gtkunixprint.h" #include "gtkprinteroptionsetprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkprintjob.c b/gtk/print/gtkprintjob.c similarity index 100% rename from gtk/gtkprintjob.c rename to gtk/print/gtkprintjob.c diff --git a/gtk/gtkprintjob.h b/gtk/print/gtkprintjob.h similarity index 99% rename from gtk/gtkprintjob.h rename to gtk/print/gtkprintjob.h index b1e4563298..f15342497a 100644 --- a/gtk/gtkprintjob.h +++ b/gtk/print/gtkprintjob.h @@ -24,7 +24,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/gtk/gtkprintoperation-portal.c b/gtk/print/gtkprintoperation-portal.c similarity index 99% rename from gtk/gtkprintoperation-portal.c rename to gtk/print/gtkprintoperation-portal.c index 4f4c4ccaae..d39ad1645c 100644 --- a/gtk/gtkprintoperation-portal.c +++ b/gtk/print/gtkprintoperation-portal.c @@ -31,8 +31,8 @@ #include "gtkprintoperation-private.h" #include "gtkprintoperation-portal.h" -#include "print/gtkprintsettings.h" -#include "print/gtkpagesetup.h" +#include "gtkprintsettings.h" +#include "gtkpagesetup.h" #include "gtkprintbackendprivate.h" #include "gtkfilelauncher.h" #include diff --git a/gtk/gtkprintoperation-portal.h b/gtk/print/gtkprintoperation-portal.h similarity index 98% rename from gtk/gtkprintoperation-portal.h rename to gtk/print/gtkprintoperation-portal.h index 6aa1219213..ee84b28f69 100644 --- a/gtk/gtkprintoperation-portal.h +++ b/gtk/print/gtkprintoperation-portal.h @@ -17,7 +17,7 @@ #pragma once -#include "print/gtkprintoperation.h" +#include "gtkprintoperation.h" G_BEGIN_DECLS diff --git a/gtk/gtkprintoperation-private.h b/gtk/print/gtkprintoperation-private.h similarity index 99% rename from gtk/gtkprintoperation-private.h rename to gtk/print/gtkprintoperation-private.h index f5daa45291..46833a63c5 100644 --- a/gtk/gtkprintoperation-private.h +++ b/gtk/print/gtkprintoperation-private.h @@ -18,7 +18,7 @@ #pragma once -#include "print/gtkprintoperation.h" +#include "gtkprintoperation.h" G_BEGIN_DECLS diff --git a/gtk/gtkprintoperation-unix.c b/gtk/print/gtkprintoperation-unix.c similarity index 100% rename from gtk/gtkprintoperation-unix.c rename to gtk/print/gtkprintoperation-unix.c diff --git a/gtk/gtkprintoperation-win32.c b/gtk/print/gtkprintoperation-win32.c similarity index 100% rename from gtk/gtkprintoperation-win32.c rename to gtk/print/gtkprintoperation-win32.c diff --git a/gtk/gtkprintunixdialog.c b/gtk/print/gtkprintunixdialog.c similarity index 100% rename from gtk/gtkprintunixdialog.c rename to gtk/print/gtkprintunixdialog.c diff --git a/gtk/gtkprintunixdialog.h b/gtk/print/gtkprintunixdialog.h similarity index 98% rename from gtk/gtkprintunixdialog.h rename to gtk/print/gtkprintunixdialog.h index 3c12c7abfa..48a5ec7b85 100644 --- a/gtk/gtkprintunixdialog.h +++ b/gtk/print/gtkprintunixdialog.h @@ -22,8 +22,8 @@ #endif #include -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/gtk/gtkprintutilsprivate.h b/gtk/print/gtkprintutilsprivate.h similarity index 100% rename from gtk/gtkprintutilsprivate.h rename to gtk/print/gtkprintutilsprivate.h diff --git a/gtk/gtkunixprint.h b/gtk/print/gtkunixprint.h similarity index 83% rename from gtk/gtkunixprint.h rename to gtk/print/gtkunixprint.h index c285b4ed00..79158f1ef3 100644 --- a/gtk/gtkunixprint.h +++ b/gtk/print/gtkunixprint.h @@ -18,10 +18,10 @@ #define __GTK_UNIX_PRINT_H_INSIDE__ -#include -#include -#include -#include +#include +#include +#include +#include #undef __GTK_UNIX_PRINT_H_INSIDE__ diff --git a/gtk/print/meson.build b/gtk/print/meson.build index 78312aabd6..79f4d085de 100644 --- a/gtk/print/meson.build +++ b/gtk/print/meson.build @@ -16,3 +16,44 @@ gtk_print_sources = files([ 'gtkprintsettings.c', 'gtkprintutils.c', ]) + +gtk_unix_print_headers = [] +gtk_unix_print_sources = [] + +if os_unix + gtk_unix_print_headers += files([ + 'gtkpagesetupunixdialog.h', + 'gtkprintunixdialog.h', + 'gtkprinter.h', + 'gtkprintjob.h', + 'gtkunixprint.h', + ]) + + gtk_unix_print_sources += files([ + 'gtkcustompaperunixdialog.c', + 'gtkpagesetupunixdialog.c', + 'gtkprintbackend.c', + 'gtkprinter.c', + 'gtkprinteroption.c', + 'gtkprinteroptionset.c', + 'gtkprinteroptionwidget.c', + 'gtkprintjob.c', + 'gtkprintoperation-unix.c', + 'gtkprintoperation-portal.c', + 'gtkprintunixdialog.c', + ]) +endif + +gtk_win32_print_headers = [] +gtk_win32_print_sources = [] + +if os_win32 + gtk_win32_print_sources += files([ + 'gtkprint-win32.c', + 'gtkprintoperation-win32.c', + ]) + + if cc.has_header_symbol('windows.h', 'IPrintDialogCallback') + cdata.set('HAVE_IPRINTDIALOGCALLBACK', 1) + endif +endif diff --git a/gtk/paper_names.c b/gtk/print/paper_names.c similarity index 100% rename from gtk/paper_names.c rename to gtk/print/paper_names.c diff --git a/gtk/paper_names_offsets.c b/gtk/print/paper_names_offsets.c similarity index 100% rename from gtk/paper_names_offsets.c rename to gtk/print/paper_names_offsets.c diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c index ed40db68aa..aa9b515878 100644 --- a/modules/printbackends/gtkprintbackendcups.c +++ b/modules/printbackends/gtkprintbackendcups.c @@ -45,9 +45,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "gtkprintbackendcups.h" @@ -57,7 +57,7 @@ #include "gtkcupssecretsutils.h" #include "gtkprintbackendutils.h" -#include +#include #include "gtkprivate.h" #ifdef HAVE_COLORD diff --git a/modules/printbackends/gtkprintbackendcups.h b/modules/printbackends/gtkprintbackendcups.h index a37a571a35..b5ac6d3980 100644 --- a/modules/printbackends/gtkprintbackendcups.h +++ b/modules/printbackends/gtkprintbackendcups.h @@ -20,7 +20,7 @@ #define __GTK_PRINT_BACKEND_CUPS_H__ #include -#include "gtkprintbackendprivate.h" +#include "gtk/print/gtkprintbackendprivate.h" G_BEGIN_DECLS diff --git a/modules/printbackends/gtkprintbackendfile.c b/modules/printbackends/gtkprintbackendfile.c index 739313064b..eb0b00ce3b 100644 --- a/modules/printbackends/gtkprintbackendfile.c +++ b/modules/printbackends/gtkprintbackendfile.c @@ -35,7 +35,7 @@ #include #include "gtk/gtk.h" -#include "gtk/gtkprinterprivate.h" +#include "gtk/print/gtkprinterprivate.h" #include "gtk/gtkprivate.h" #include "gtkprintbackendfile.h" diff --git a/modules/printbackends/gtkprintbackendfile.h b/modules/printbackends/gtkprintbackendfile.h index 0ca051b5ff..280b901d00 100644 --- a/modules/printbackends/gtkprintbackendfile.h +++ b/modules/printbackends/gtkprintbackendfile.h @@ -21,7 +21,7 @@ #define __GTK_PRINT_BACKEND_FILE_H__ #include -#include "gtkprintbackendprivate.h" +#include "gtk/print/gtkprintbackendprivate.h" G_BEGIN_DECLS diff --git a/modules/printbackends/gtkprintercups.h b/modules/printbackends/gtkprintercups.h index 81b6cfb9c8..fb67f6ac83 100644 --- a/modules/printbackends/gtkprintercups.h +++ b/modules/printbackends/gtkprintercups.h @@ -23,8 +23,8 @@ #include #include "gtkcupsutils.h" -#include -#include +#include +#include #ifdef HAVE_COLORD #include -- 2.30.2